From 095d7c33d7b3d7439cba72501b94ec90e31da1ec Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 27 Dec 2001 20:43:58 +0000 Subject: [PATCH] Call gdk_window_get_pointer() on menu->bin_window not menu->window, so we Thu Dec 27 15:38:20 2001 Owen Taylor * gtk/gtkmenu.c (gtk_menu_stop_navigating_submenu_cb): Call gdk_window_get_pointer() on menu->bin_window not menu->window, so we get the correct window for the menu item. (#65213, Guillermo S. Romero) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkmenu.c | 2 +- 8 files changed, 50 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2d828a0f1b..0200bdfe83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Dec 27 15:38:20 2001 Owen Taylor + + * gtk/gtkmenu.c (gtk_menu_stop_navigating_submenu_cb): + Call gdk_window_get_pointer() on menu->bin_window not + menu->window, so we get the correct window for the + menu item. (#65213, Guillermo S. Romero) + Thu Dec 27 15:13:44 2001 Owen Taylor * gtk/gtkmenu.c (gtk_menu_set_title): Allow unsetting diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 2d828a0f1b..0200bdfe83 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +Thu Dec 27 15:38:20 2001 Owen Taylor + + * gtk/gtkmenu.c (gtk_menu_stop_navigating_submenu_cb): + Call gdk_window_get_pointer() on menu->bin_window not + menu->window, so we get the correct window for the + menu item. (#65213, Guillermo S. Romero) + Thu Dec 27 15:13:44 2001 Owen Taylor * gtk/gtkmenu.c (gtk_menu_set_title): Allow unsetting diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2d828a0f1b..0200bdfe83 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Thu Dec 27 15:38:20 2001 Owen Taylor + + * gtk/gtkmenu.c (gtk_menu_stop_navigating_submenu_cb): + Call gdk_window_get_pointer() on menu->bin_window not + menu->window, so we get the correct window for the + menu item. (#65213, Guillermo S. Romero) + Thu Dec 27 15:13:44 2001 Owen Taylor * gtk/gtkmenu.c (gtk_menu_set_title): Allow unsetting diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 2d828a0f1b..0200bdfe83 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Thu Dec 27 15:38:20 2001 Owen Taylor + + * gtk/gtkmenu.c (gtk_menu_stop_navigating_submenu_cb): + Call gdk_window_get_pointer() on menu->bin_window not + menu->window, so we get the correct window for the + menu item. (#65213, Guillermo S. Romero) + Thu Dec 27 15:13:44 2001 Owen Taylor * gtk/gtkmenu.c (gtk_menu_set_title): Allow unsetting diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2d828a0f1b..0200bdfe83 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Thu Dec 27 15:38:20 2001 Owen Taylor + + * gtk/gtkmenu.c (gtk_menu_stop_navigating_submenu_cb): + Call gdk_window_get_pointer() on menu->bin_window not + menu->window, so we get the correct window for the + menu item. (#65213, Guillermo S. Romero) + Thu Dec 27 15:13:44 2001 Owen Taylor * gtk/gtkmenu.c (gtk_menu_set_title): Allow unsetting diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2d828a0f1b..0200bdfe83 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Thu Dec 27 15:38:20 2001 Owen Taylor + + * gtk/gtkmenu.c (gtk_menu_stop_navigating_submenu_cb): + Call gdk_window_get_pointer() on menu->bin_window not + menu->window, so we get the correct window for the + menu item. (#65213, Guillermo S. Romero) + Thu Dec 27 15:13:44 2001 Owen Taylor * gtk/gtkmenu.c (gtk_menu_set_title): Allow unsetting diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2d828a0f1b..0200bdfe83 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Thu Dec 27 15:38:20 2001 Owen Taylor + + * gtk/gtkmenu.c (gtk_menu_stop_navigating_submenu_cb): + Call gdk_window_get_pointer() on menu->bin_window not + menu->window, so we get the correct window for the + menu item. (#65213, Guillermo S. Romero) + Thu Dec 27 15:13:44 2001 Owen Taylor * gtk/gtkmenu.c (gtk_menu_set_title): Allow unsetting diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 7041510f9a..133c9fe887 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -2037,7 +2037,7 @@ gtk_menu_stop_navigating_submenu_cb (gpointer user_data) if (GTK_WIDGET_REALIZED (menu)) { - child_window = gdk_window_get_pointer (GTK_WIDGET (menu)->window, NULL, NULL, NULL); + child_window = gdk_window_get_pointer (menu->bin_window, NULL, NULL, NULL); if (child_window) { -- 2.30.2